From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Tue, 22 Sep 2009 19:49:50 +0000 (+0000)
Subject: (EmacsMenu-menuNeedsUpdate): Ignore if frame has been deleted (bug #4492).
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10353
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c351cd59183d5e264b3ebccd4d2a6256ef589a1d;p=emacs.git

(EmacsMenu-menuNeedsUpdate): Ignore if frame has been deleted (bug #4492).
---

diff --git a/src/nsmenu.m b/src/nsmenu.m
index 335e4c0e640..79644d28a80 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -568,7 +568,10 @@ name_is_separator (name)
    to set_frame_menubar */
 - (void)menuNeedsUpdate: (NSMenu *)menu
 {
-  NSEvent *event = [[FRAME_NS_VIEW (frame) window] currentEvent];
+  NSEvent *event;
+  if (!FRAME_LIVE_P (frame))
+    return;
+  event = [[FRAME_NS_VIEW (frame) window] currentEvent];
   /* HACK: Cocoa/Carbon will request update on every keystroke
      via IsMenuKeyEvent -> CheckMenusForKeyEvent.  These are not needed
      since key equivalents are handled through emacs.